View: added a small error check.
View: added Event comments and a todo.