More R5 (in progress) updates incorporating a few changes I got from Mrs. Hayhurst.