Several fixes

+ several fixes
+ windoweventlistener
Merge pull request #116 from Peda1996/master

Several fixes