updated expression quads and renamed oaf_math to oaf_expr