New and improved comments!