Update CHANGELOG, lean up a couple of loose odds and ends