Fixes and test for oxford gen reader