Bug fixes in client controller, started server controller