fix error + small tweak