fixing up non-indent styling & a few twiddles.