minor essential tweaks