adde small sample and minor cleanup