A bunch more db changes. Cleans things up some.
Signed-off-by:Joshua Dickerson <joshua.a.dickerson@gmail.com>