Lots of new options, urlsnarf remade using just python