Some windows fixes, some comments made.