Fourth Commit

fix typo on model & optimize tables