Multiple corrections & improvements

...but still a long way to go.