debugging & some merging of DB code