Small changes, mostly to related to read number