Event and minor bug fixes