R2 Demo Tweaks

Noticed a few issues that needed changed before demo time.