Updates to CruNCH