code clean up , plus new player test code