more changes from unix