adaptation no node-class 1.0
many minor fixes and improvements