fix firefox and rework things