Introduced the NopLeaf

and some bugfixes