msbuild fix for vs2013 and TODO updates