couple error messages and const organization