Converted a bunch more print statements to logger calls, fixed some long comments