small fixes, added map, icons