updates

more template testing and updates