fixed some json and added first functionality