merge fixes/changes