Added more content events and a few minor fixes