fixing import
cleaning up backports
minor internal cleanup
adding missing --use-mirrors flag