Added some improvements to the reader.