Random Fixes and Various Improvements to NodeConnector