Lots of improvements in text reader & minor fixes