better handling of (lacking) space in commands