More parsing, including command arguments