migrate to template
fix stray <?