fixes for new namespacing
adding examples
Merge branch 'inner-mod'
back to master for peruse