Cleaning up more Reader Macro Functions, adding lots of JavaDocs. More to cleanup coming.