more work on linux support