Some errors fixed, some new errors discovered