added more TODOs and a FIXME