add tables, fix models