Updating comments... Catching them up with the code...