changed colors and fixed map