env-passing, patch up context resolving gap, add a couple todos