fixed some TODO items