Misc fixes

I think reads and citations are essentially the same (ie. they dont' need separate classes)
what's the reasoning here?