a few more simple tweaks