Issue161 durack1 1p0p0 tag commit

Further tweaks to resolve remaining #161 issues