cleaned up the app, removed warnings, etc