added options to not download either src or pkg files
Tidied up a bit