Added a timeout to all the click tracking

This addresses issue #4.