edited map. made movement and bullet speeds more reasonable
merged code