Corrected multiple runs, added firefox support