More design tweaks for skimmer