Revert "Revert "updated app, removed bugs, added error message""

This reverts commit adc956ed97ec9f38dcbc8be399feae7937e6db71.