more analysis errors corrected