Performance Improvements (#53)
Merge and update perf improvements