improved template engine
router updated