Minor code changes and went back to .NET3.5.