cleaned up, commented on all templates