Several improvements before SWAT4LS.
Refining with FindBugs.
Improving external database mapping. Minor changes.