comments, typos, cleanup