Update #19

Several updates with slight changes.