Updated client, starting to tweese apart various concerns