Fixed a few things; refined others.