update OS and arch detection, mac-universal needs testing