Fix labels, and minor formatting for example tables.
For some reason I'm forced to do a commit of everything because some merge failed. In prelims: fix labels, and minor formatting for example tables. In queries: many many many changes =)