fix and code commented