Upgrade to VS2013 and updates