fix up expressions

need to do a bit more cleaning up the public side of this