Add JSON formater + fix marcjs script to end properly files