Minor fixes and template tweaks
FT817+
Yahoo! lost it