Some minor changes and additions + 'Still to be decided' sections