fix without server

Signed-off-by: Andy Green <andy.green@linaro.org>
fix string escape runon

Oh well it was a big patch to just be cosmetic ^^

Signed-off-by: Andy Green <andy.green@linaro.org>