small fixes at work and the first JSON