more refactoring related fixes
Merge branch 'master' of github.com:mbeddr/mbeddr.core