Fixes and add-ons for mode_compute

Johannes Pfeiferrequested to merge
JohannesPfeifer:mode_compute into master

Deals with #507 (closed) and #508 (closed)

Merge request reports