some fixes

Not Windows only case implemented
Fixed missing linebreak