updates to fix click and to better test