indenting fix, minor tweaks