Update code + win&mac-proof downloading