add 'watch cards' client function, fi bugs
bug fix
fix merging comflict