Added New Nodes, clean up, refactor
Merge branch 'master' of https://github.com/evilsoft/evil-subtrakt