More improvements
Fixed comments