some tweaks based on email comments