general fixes
bugfixes