add minor improvements