Dave's updates to smoking and drinking modules