last few fixmes