Ugly list of small changes

This MR contains a bunch of small changes which are unrelated to the tomo (but used in the tomodemo branch)

Please tell me if you prefer to split this ugly stuff.