merge

merge fixes and interface consolidation