Small improvements
More notes