More TODO and fixed colors