[TASK] Quite a few minor tweaks and fixes - and test coverage to 98% of all classes