fixed some more bugs and clean up, master_pipeline works up to generateTokenizedRevs now