some lambdas are dependent, more work needed. Some cleanup. Bizarre new error