A few more minor changes and additions