Feature/richardreview

Various fixes and enhancements to the reapplication codebase