added collection updating
validation fixes