fixes #2 updated ERD & annotated models