Further fleshing out
Minor fixes