various changes everywhere