Events cleanup
Updated change log
Minor fixes