- changed some TODO's to FIXME's to keep it grep-consistent