Also pass client after changeId
Bunch of bugfixes. Also fixed ID bug