Made a bunch of changes, but it's late and I can't write about them