added bonus pieces and control swapping on getting a bonus piece