fix the stuff I broke yesterday trying to get the semantics stuff to work