Cleanup; Some Bugs fixed
lambda.ps added
Merge