initial migration to match user model + minor fix