code style, bug fixes

Merged Mark OLESEN requested to merge feature-reorganise into develop

Merge request reports