Lots of minor edits and adjustments :)