Few changes

Hopefully the commit logs pretty comprehensive.
Some optimizations, de-nesting, missing implementation fix, and some fxcop-cock polishing.