Code cleanups, and color timeline fixes.