First round of proof-reading updates through line 64