Some comments added from previous commit.