some nice fixes
more fixes
some unfinished fixes
some good fixes