I should commit more often. Various changes.