Added various changes.