client: really fixing stuff up.