various edits and style updates