added map stuff, collision