formatting, added template q's