Added some events and other minor changes

//Pontus