Add in refillable containers, bugfixes.