Add/test more optimizations