Several fixes

+ several fixes
+ windoweventlistener