Bugfixes and working NERTZ!!!!