minor bug fixes
just to make sure there is nothing left uncommited before I go to work