slight restructure. Other misc edits.