more @windows fixes from switching from array to map