Initial event system commit + small fixes