Enhancements to the updateHandler, fixes #194 #195 #196