side changes
post conflicts
fixed fusenodes, improved simpifications