minor improvements, added 'client table into database