finished devise again & fixed errors