Minor updates

Fixing bugs as I see them yet again