fixed several minor issues