Added TapSound, Fix Bugs with Z-Form and T-Form