Fix #46
Improve perf table with large data
Fix #12