Client bugs fixed
Still need expected method