remove debug logging
small template tweaks