fix formatting
client stuff working now; improved usability of a few things, shared code between client and broker.