Merged Christian's work. The fixed features should be tested by the reviewer before it can get merged!