Performance improvement
Added a very large test file
some minor perf improvements