adds more json improvements