redo some missed changes
Merge branch 'master' of github.com:eXpansionPluginPack/eXpansion