minor changes and ready to test on lake