Web/Code: More Fixes and Optimization.
Thanks @ Kim Benker