Sweeping changes to readarticles. Down to 19-23 queries. Good enough for now.
Genereal cleanup.