Got rid of the benchmarkjs dependency + a lot of changes - cleaning needed