added grepwa, updates