updates for bugfixes, compatibility with nw3.0