merged all linux changed with osx changes