minor tweaks'