Fixes

About half done, have to go to bed will do more in the morning.