performance tweaks
Merge pull request #1 from monotomy/slave_client

performance tweaks