clarified and fixed env for transitions
changed lambdas to inline functions, fixed some table entries