general fixes
more fixes