added more missing templates + fixes
Merge pull request #136 from sn0opy/master

added more missing templates + fixes