Trigger a didRefreshEvent when the fields chagned

Also some minor refactorings.