R2RML comments, fixes, and pretty writer