improvements for zertify demo