Ability to update fields and fix some timing issues