fixed up everything nicely, corrected dbSetup to include the new tables