fixed first round of errors