Small fixes and finish data collect section