Additional color change switch fixes, ball filtering logick fix