Small fix + new map