Fix read changed collection error, work on finishing