Additional comments and minor restructuring