more changes to assignments; still trying to track down deadlock on NERSC