tweaks and FF fixes