Enhancement Edits: Cleaning Up Annoying Details

John Kraft Visits could still use a little more work, but frankly I'm sick of working on it right now.