fixing some more poorly organized db calls
spec changes