finalizations
merge fixes