little fixes and tweaks;
Merge branch 'master' of https://github.com/carlsmoh/templates