More small changes

Hooray.