Move patch option preparation to top
Improve download command