Small updates and add comments