Upgrade to VS 2013; many other changes