More progress on Firefox extension & core