improving PIP events + enhancements