Have updated the smaller and simpler issues however the underlying .nodes and method changes are still needed to be fixed.