several minor changes