rewire WrapCtrl and main template; improve map performance; fix #131