update model fk names
commit some comments and fixes