few bug fixes, coloring+