tableview and cells plus more cleanup