fixed devise issues
final fixes to devise