Made a bunch of improvements.