Major additions to fixes to MASCOT pipeline