Completed tablemaker and revised template files