Add comments and error messages.