Minor tweaks to gameTemplate (and possibly others)