Minor amends and cleanip.