added #310
did #304, #306
all unification looks good now