Adding client + small fixes to make stuff work