fixed migrations, rechecked schema