added responses, json generator, fixed npe-s