some more fixes

small things
some cleanup

test!