[CHANGE] minor tweaks;