More colors! see doc for the two bugs I found