a few other minor changes