Minor misc changes. Getting ready for QA