Slight re-org
Minor fixes