Some debug stuff and added a few more events