cleanup and some new game templates