More major work on Jala, fixed Sundara problems.