some fixes on formatting and a few typos