Minor fixes
* Added the "-" for node names
* Added some missing types