Made minor changes to main application.