Fix Bugs and Update Migrate