Minor detail tweaks