divided Reader library into 2 libraries; minor cleanups