made some general fixes