fixed eventer module and several bugs