fix the dispatcher
and some other minor template edits

Signed-off-by: Suki <suki@missallsunday.com>
Moar changes!

Signed-off-by: Suki <suki@missallsunday.com>