more nick plugging tweaks