Is this a 16L or 18L kit? On the box it does state that it contains 18L but does this include the crushed grape pack? I have added a total of 5L of water. With the grape pack added also, it just reaches the 23L mark and the OG is 1.096. Is this correct or should I add another 1.5-2L of water? Thanks in advance for any advice.