fixed some devise bugs