Further updates logging and comments