added new color map
smaller updates