repaired some bugs with the client form