fixes

changed for pygame events
Merge remote-tracking branch 'origin/master' into felix