Updated toJson based on sethladd input, also added toString