Fixed some commands; add reconnects to client.