Can have spaces in custom commands now.

Fixed use source/dest for custom commands.