Some mild refactoring and cleanup.  Handles jumps out of the app now as well.