More notes on changes to be made, no real changes yet.