improve command symbol parsing