fixed json converters, added more mock data