general fixes
fixes