added comments and 1 fix