Two new templates; Bug fixes.
Please file an issue following all the guidelines if you have trouble - in general it's impossible to fix problems just from comments like this.