lots of reader fixes