Add Several Minor Changes to Better Match the Project Spec