fixed problems with Firefox
fixed conflicts