final updates to finish devise integration