New comments and doc for the classes