More bug squashing and new content

Questions fully work with new JSON format