Fixes and tweaks a-plenty!