Optimizations & Fixes