updated to typed datasets, added combined table to database to ease problems with table joins and datatypes