minor style/other fixes