Updates and conversion to VS2013
Changes to help get WU running more efficiently and accurately