added several minor fixes