Fixed a couple of issues that were breaking tap
Added more tap events