Bug fixes, new event, more general fixes