added per-vertex coloring flag, cleanup