Lotsa Fixes and bits and bobs!

I changed a lot and can't remember what all I did. Something important,
I hope.