Recovering from merge and bugFix

on update with ENTER event fired twice
Fixing bug collection resulting from bug hunt