Some additions and expression corrections

Implemented the canFill() and canDrain() methods properly and put them
into use. Also changed all "liquid" into "fluid".