fixed linux builds
merged and fixed nate's changes