Tweaks, and allowed for changing the source and workspace directories via commandline argument