removed console output and added map stuff