add some error handling
send correct updates everywhere