added color mapping
corrections