Rewritten and improved on naming of unit an player functions as well as variable setup for players and units

Rewritten and improved on naming of unit an player functions as well as variable setup for players and units #2332