I didn't commit all my changes, so here's some more.