some new add; regexp additions
regexp changes