cleaned up db, functioning now