Updated map with environment

Also fixed gamebreaking bug with map movement