Change wget for curl (never send a boy to do a man's job) and a few minor changes