Fixed an issue where the faucets could get stuck open, see #53.  This also addresses some assertions that were occurring, see #54.