Improving comments and manual