added minor tweaks