Improvements on Event performance, + fixes on specs + Misc fixes on code