!U WIP refactoring
!B some fixes
Merge remote-tracking branch 'origin/master' into branch_pygame