Fixes and improvements for projector and template