More functions and events, should be up to date for 1.2.2