Fix crashes, dress up

Use new json