Nunchuk Fix and Overlay Cleanup