Add additional comments
Add json viewer
Fix conflicts