Minor modifications for previous commit. Added new argument options.