Fixing some typos and allowing for large aland/awater numbers.