added devise, fixed config