Fixing bugs

I squashed them under my boot!