general fixes
general fixes