fixed several minor issues.