fixed bugs
Better handling of colors