Fix namespace problem and fix some comments