multiple minor fixes