Thanks for the detailed response.

I've decided to cover everything in the terms of service similar to how you have suggested.

Thanks again!