Bug Fixes and players module changes