Minor changes, mostly to comments