Add minor print modifications and FIXME documentation