a few more little tweaks