WIP: add more test. fix coloring