final fixes
I consider this done.
Merge remote-tracking branch 'origin/master'