CLC-2173 Notes & beginning fixes from code review - WORK IN PROGRESS