various changes and such