more osx fixes, arithmetic is still broken