updating class attributes to change colour and using data with NaN rathe...

...r than 0. We are no longer loading new maps. Two different colours for retail and wholesale. Hurray! Hurray!