fixes

lots of them