Adding clers expansion of lagoons too. Fixing bugs