Updated to VS2012.
Minor tweaks.