More nodes, bug fixes and general improvements