improve command info parsing