Minor corrections
Remove reliance on temporary external database file