Clenaing up env search
Tail calls are lossing context.
I figured out what is breaking tail calls, now I need to fix it.