Minor exception change
Some minor doc and deprecation changes
Bug fix: not including waters in contact calculation