Moar bug fixing, event types.