More little cleanup items.
O2 Graph text to match line colors.
Remove todo as it's done.