batch of little changes