#46 Correcting copy and paste errors and typos