Bug fixes round 2

I hate everything
Bug fixes listed in email