Lots of not very important changes

Mostly new bugs