Took care of most TODO items