fixed devise issues
finished adding devise