Massive refactoring
Fixed state issues, added friendly upgrade names
Improved player wrapper system