Tons of fixes, enabled Events