maps! plus some template cleanup