Tweaks to randomized positions, cleaned up inner GraphFactory generation