WIP fixing comments mentioned