Some code tidy and fix h2 database use.
Add Resident names to auto completion.