wax.json and other improvements