added devise and edited config