issue #284 - improve spilling and cleaning liquids