better db and clean ups.