A couple of quick fixes
Tweaks and formatting stuff