Some minor changes. Two files missing from last commit. Waiting to amend
it