Better json error handling, prepare enhanced data model

Prepare timetable...