firefox adaptation and minor fixes