several minor fixes #2