Add coloring support, fix minor bugs