Updated to VS2012, added some performance improvements