cleaned up some stuff in a hopeful attempt to get Windows to work