Mostly comments, some additional changes for prep to MinGW