More and improved comments