Simplified page; Fixed comments