renamed some stuff and updated json deserializer