better organization; bug continues

almost sure bug is in the changePlayer().
Highly recommended to rewrite this method.