some headers (comments) has been improved