main() now loads json / minor fixes to json structure