Improve finite liquid distribution, fix small bug