CPAP and travel

I just flew from S.F to Austin, Tx. TSA at S.F. scanned it through in a carryon luggage bag that I bought for it. In Austin, they had me put it into a tray and x-rayed it. I bought a small sturdy carry-on laptop/overnight bag that will fit on the smallest planes. It has wheels and will fit under the front seat. I can strap it to my other carry-on bag so it is easy to use and transport. I take the CPAP out and leave it in the hotel and use the bag for my laptop/briefcase while on a business trip. I use a stainless steel water bottle for distilled water and have been checking it in with my larger bag. I haven't tried taking it through security. For my recent short trip, I didn't take the humidifier.