Archive current directory and default to current user
Bunch o' small fixes and tweaks