all map types working now