removed stupid Settings-pointer and added some map code