namespace display fix, some other formal fixes
Merge remote-tracking branch 'origin/master'