refactor connections, fix accountables