improved schema and made basic model/view work with the changes