templates updates
clean up template builder collection method
umm... whoops