Made several minor changes