Making more options configurable

Also we were using the wrong variable after wp_parse_args
Revert "Making more options configurable"

This reverts commit 98e14c0d920e74ec16282f35fa9584ca3a6b8be7.
Revert "Revert "Making more options configurable""

This reverts commit 6567bd84b55e6d1cedbf108f9ae47574729819fa.
Make archives pass current URL