modified dist to be 1-2
Merge branch 'master' into arithmeticOverhaul