Final changes before heading to 10K lakes. Tested and works.