Various docblock changes and slimmed down the readercontainer a bit