firefox bug and some changes