fixes to data model, adds persistence.xml, hsqldb