A fine collection of missfit fixes and tweaks

One fix was already committed by ema, to lazy to remove it but since this was on a branch pre that fix git should not care.

The rest are various fixes or minor refinements