fixes and tidy up

after a while of being away did some updates and fixes after the fact.