fixed imports, decided some other TODO items were either unimportant or had been mostly met.