minor style and other improvements