Add comments.

Remove consts where it makes sense.