Made a few minor improvements.