Add new fluid and bucket, fix some bugs