Cleaning up the migration a bit, tabs get out! fixes #1