Removed demo stuff, added map handling