Node Movement and General Improvements

See commits for the deets.