updated todo.
renamed error message functions to follow naming conventions.