Same changes I made for T-Reader

Having to make a new branch (strangeness between merging earlier may
have bamboozled my original branch)