Cleaned some things up, made some minor changes.