correct comments and documentations