general fixes and updates