lots of cosmetic changes, change to database sample data