Completed support for new nerdz features. Some fix