Quick updates

Making sure everything is in EMs, semantics, cleaning up.