template cleanup, use includes, fixed phone numbers, etc.