Finish on Migrate and Fix Bugs