Further refactoring and bugfixes of nmkEngine
Bugfixes to previous commit