various bug fixes & event path link