some fix, render improve & minor opti