Spit & polish

Fixed another few bugs and oddities