Add more events, more documented