Minor TODO's finished; pretty-printing versions