Added some events, and did other things