add tags
get rid of "Ω" - use Expect, it's more readable

also some other cleanup