More changes. Done with checkins for now. Not a very helpful commit message, I know.