important general fixes