Made several small changes.