Minor Tweaks

Made a few small changes before we merge the two branches.