bug fixes
more fixes