Made the colors better for the minimap, minor cleanup of old code