Attempt to fix weird graph shifting, other small changes

cc @mrapple