bunch more FF fixes