* Improved image unspoilering
* Fixed case in event names