some minor tweaking