more setter tweaks