minor contexts
misc
Merge remote-tracking branch 'origin/master' into env_fault
reorg
simplified code