Correct errors displayed; more constants