fixed migration + devise issues
more modification to the model