Updating client and self healt data DONE.
Closes #18 Closes #19