adding tap event; cleanup