Added Change_Player function and tested. And some minor improvements