On My Way Out: Update 1

few bug fixes.