tweaked db stuff