fixes of map etc