cleaned some more mess up, particularly in parseCorrect function