Clean up and final fix.. Should be good for windows.