Better colorings
Fix comments