Cleaning up and minor additions.