Edgar fixes

New fixes to the paper and set environment scripts.