minor fix and comments