self-avoid sample and other tweaks