chore : Perf test

and other fixes...

Close #87