Optimizations & Small changes & Bug fixes