fixin up templates