Updates to Heppy branch from Colin & Andrea