Added more functionality, bug fixes and arrows from one node to the next