@@ -53,9 +53,9 @@
 	-- like rainwater and tree sap. they hold twice as much as a bucket
 	local Q = constants.glasses_per_bottle
 	local trough_mkid = function(l,i)
 		if type(l) == 'string' then l = sorcery.register.liquid.db[l] end
-		if not l or not i then return 'sorcery:trough' end
+		if (not l) or (not i) or i < 1 then return 'sorcery:trough' end
 		return string.format('%s:trough_%s_%u', l.mod,l.sid,i)
 	end
 	local lid = function(l) return trough_mkid(liq, l) end
 
@@ -164,8 +164,18 @@
 
 sorcery.liquid.measure_default = function(amt)
 	return string.format('%s drams', amt*constants.drams_per_glass)
 end
+
+sorcery.liquid.container = function(liq, ctr)
+	return liq.containers[({
+		bottle = 'vessels:glass_bottle';
+		glass = 'vessels:drinking_glass';
+		keg = 'sorcery:keg';
+		trough = 'sorcery:trough';
+	})[ctr] or ctr]
+end
+
 sorcery.liquid.register = function(liq)
 	local fmt = string.format
 	local Q = constants.glasses_per_bottle
 	liq.sid = liq.sid or liq.id:gsub('^[^:]+:','')