Various Small Changes - Get Code Working in Win