Dfoxpowell/bug fixes tues 9