more clean up
minor
misc
Some fixes and change in presentation
bitrot
Merge remote-tracking branch 'origin/env_bv' into env_fault
minor