Better combo curl/wget handling

Fixes #451
which part? (i'll take out the echo, oops)