fixed some things on the client
Merge branch 'client' into devel