upgraded to .NET 4.5.1, clean ups and mods