minor reformatting, validation tweaks

minor reformatting, validation tweaks