more code change. finalized devise setup