Several improvements using new iFaucet Class