general fixes.