expressions and minor fixes