Some migrations and a little markup