Refactored some code in errors and changes view.
Also fixed issue #1 along the way.