cleaned up plotting and calcProp files