Updated docs/optimizations