minor improvements to copy/layout