Cleaned up app
Added some basic error handling