Fix bug with ARGV quoting
Remove trailing whitespace