Improve client db

this adds the functionality mentioned in #7 
why will there be a space at all? there should be no space