More comments and improved behavior