dispenser fix 

Teajizzle's dispenser fix, plus my checking and working around a spigot bug