A bunch of various changes.