Improved updating of server high timestamps; fixes to demo