cleaning up layout, fixed typo, and whole bunch of housework