GPII-511: Adds more log statements and tidies up existing logs.