LOS/Cluster -- Fixes and Optimizations