added a bunch of stuff while processing McMaster data