Made some general improvements.