Fix some style issues, a few typos