Implemented most proposed changes.