Minor fixes
Some notes in the direction of a windows version