Fixed some missing logs & comments