Fixed weapon functionality to player class
Improved api calling
Tweak weapon handling