Lakebed: water streams corrected and other fixes