bugs fixed in event controller