More things working: Fixes, tidies, features