minor fixes
implemented the comments