minor formatting tweaks and some high level goal adjustment