made various changes