Fixed comments, etc.