fixed formatting, minor tweaks