fix templater's templates; transport implrovements