some updates, removed keyring except from settings.py for later implementation