More work on Sparqlify. Mostly bug fixes.