merged in registrar fixes, created redis expiration
merged