Fix & improve $.event