smal linux related changes
merging linux and windows changes