Some formatting and misc changes