removed several fixmes