general fixes; more added later