Mobile events refactoring and some bugs fixed