fixed templates
API: json goes in the body now.. (+ merge conflicts)