Very helpful, thank you! I will be hunting for some waterproof pads to switch out and will be trying Huggies. The double-diapering was something I was wondering about too - we may try that if the Huggies don't do the trick.