client : fixing stuff up.