qualitiy improvements
Quality improvements