Working DB

Minor modifications.