Cleanup mostly finished. RLF coloring does not quite work yet.