updates to initial firefox implementation