fixing things
more commits