fix doc and comments