Some TODO items done