Updated some comments and documentation