Moving a few things around. Cleaning up JavaDocs. Gonna work on cleaning up the reader a bit.