commented out db and fixed minor bugs