Added map + fixes