some template cleanup, bump version