More improvement on visual and some tunning