Fixed some issues and added some nodes