Fix row fill out
Add missing updates