Minor changes. Getting ready to add route changes.