Feature/richardreview

Various fixes and enhancements to the reapplication codebase
Hm, what is this test supposed to do? No assertions or a comment to say it should be tested manually in certain circumstances.