Next batch of fixes

With the release near I think it's time to merge this. I've been playing with it, so it should be fine. :)