revise previous fix
Merge branch '31-cleanup' into 33-static-boxes
Merge branch '31-cleanup' into 34
tweak do_set mod for corrected envir.c
more tweaks in do_set
Merge branch '33-static-boxes' into 34
fix last mod
Merge branch '33-static-boxes' into 34