More minor improvements to the reader.py