Added XOR solo button functionality, cleaned up code