Style tweaks

contains fixes for issues introduced in earlier pulls, but didn't want to fold into other issue branches.