Improve several comments in lib