Renamed some blocks, added ClientEventHandler