final adjustments...
Merged 04, tiny additions afer exam