Formatting, minor changes, docs