Got some stuff mixed up, here's some more small changes.