Added the application
Updated ending dialog
Improved error handling