Some reformatting and additional notes