Slightly improved reader stuff .. still very wrong