Multiple corrections & improvements

...but still a long way to go.
Merge pull request #1783 from ussuri/new-project-templates

Multiple corrections & improvements