add some namespace uses and fix comments