Comments and coding changes for target change to .net 3.5