fixed errors and new mirgation