several tweaks.
Merge ../working