more symbols, some regexp cleanup