(chore) #5 code cleanup, corrected console messages, and changed order of addr used in ct