Couple bugfixes. Map does not reset when size is changed.