Fixed: #638, #640, and misc cleanup fixes
reworked spill file cleanup
Merge pull request #650 from kutschm/master

Fixed: #638, #640, and misc cleanup fixes